bitkeeper revision 1.1726.1.2 (42b9799cvxl7PK_CkhwRTPueXP17ew)

Fix defintion of PAGE_MASK so that pae builds again.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index 87a47f86670ca27c360dab88d74615a96901ac4c..29b9f518a87ae2e13b8e24d14491003d41a8f6af 100644 (file)
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -2,13 +2,13 @@
 #ifndef __X86_PAGE_H__
 #define __X86_PAGE_H__
 
-#ifndef __ASSEMBLY__
-#define PAGE_SIZE           (1UL << PAGE_SHIFT)
-#else
+/*
+ * It is important that the masks are signed quantities. This ensures that
+ * the compiler sign-extends a 32-bit mask to 64 bits if that is required.
+ */
 #define PAGE_SIZE           (1 << PAGE_SHIFT)
-#endif
-#define PAGE_MASK           (~(intpte_t)(PAGE_SIZE-1))
-#define PAGE_FLAG_MASK      (~0U)
+#define PAGE_MASK           (~(PAGE_SIZE-1))
+#define PAGE_FLAG_MASK      (~0)
 
 #ifndef __ASSEMBLY__
 # include <asm/types.h>